Fix problems with HVM PAE guests with >4GB memory.

Signed-off-by: Xiaohui Xin <xiaohui.xin@intel.com>
Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>

diff --git a/xen/arch/x86/shadow.c b/xen/arch/x86/shadow.c
index 410dc5812ffca9ab858fcd7342e68d50a50539cd..6ed126eb96ffabd41007cdff7ddc7a7780aed3e3 100644 (file)
--- a/xen/arch/x86/shadow.c
+++ b/xen/arch/x86/shadow.c
@@ -279,8 +279,8 @@ alloc_shadow_page(struct domain *d,
              psh_type == PGT_l4_shadow )      /* allocated for PAE PDP page */
             page = alloc_domheap_pages(NULL, 0, ALLOC_DOM_DMA);
         else if ( d->arch.ops->guest_paging_levels == PAGING_L3 &&
-                  psh_type == PGT_l3_shadow ) /* allocated for PAE PDP page */
-            page = alloc_domheap_pages(NULL, 0, ALLOC_DOM_DMA);
+                  (psh_type == PGT_l3_shadow || psh_type == PGT_l4_shadow) )
+            page = alloc_domheap_pages(NULL, 0, ALLOC_DOM_DMA); /* allocated for PAE PDP page */
         else
             page = alloc_domheap_page(NULL);
 #endif